from trunk

diff --cc src/ChangeLog
index 2448967c52dd9b430932e2e46ba054e53782485e,1b41392c3ce437d23b5eb505f253aa4812415edb..35a5fd6e4a0213a65f3fbca6267e5c8dbc353816
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,9 +1,14 @@@
 +2010-01-27  Kenichi Handa  <handa@m17n.org>
 +
 +      * regex.c (analyse_first): Fix setting of fastmap for unibyte
 +      pattern string.
 +
+ 2010-01-27  David De La Harpe Golden  <david@harpegolden.net>
+ 
+       * fileio.c (Frename_file): Call copy-directory and
+       delete-directory for directories, in order to handle cross-device
+       renaming (Bug#3353).
+ 
  2010-01-25  Jan Djärv  <jan.h.d@swipnet.se>
  
        * xfns.c (Fx_create_frame): If frame height is too big, try